Merge remote-tracking branch 'origin/master'
authorYaroslav Brustinov <[email protected]>
Thu, 18 Feb 2016 14:59:34 +0000 (16:59 +0200)
committerYaroslav Brustinov <[email protected]>
Thu, 18 Feb 2016 14:59:34 +0000 (16:59 +0200)

Trivial merge