Merge remote-tracking branch 'origin/master'
authorYaroslav Brustinov <[email protected]>
Sun, 28 Feb 2016 09:12:35 +0000 (11:12 +0200)
committerYaroslav Brustinov <[email protected]>
Sun, 28 Feb 2016 09:12:35 +0000 (11:12 +0200)

Trivial merge