Merge remote-tracking branch 'origin/master'
authorYaroslav Brustinov <[email protected]>
Tue, 8 Mar 2016 11:38:31 +0000 (13:38 +0200)
committerYaroslav Brustinov <[email protected]>
Tue, 8 Mar 2016 11:38:31 +0000 (13:38 +0200)

Trivial merge