Merge remote-tracking branch 'origin/master'
authorYaroslav Brustinov <[email protected]>
Wed, 9 Mar 2016 12:05:47 +0000 (14:05 +0200)
committerYaroslav Brustinov <[email protected]>
Wed, 9 Mar 2016 12:05:47 +0000 (14:05 +0200)

Trivial merge