Merge remote-tracking branch 'gerrit/master'
authorYaroslav Brustinov <[email protected]>
Mon, 5 Dec 2016 09:45:08 +0000 (11:45 +0200)
committerYaroslav Brustinov <[email protected]>
Mon, 5 Dec 2016 09:45:08 +0000 (11:45 +0200)

Trivial merge