Merge remote-tracking branch 'origin/master'
authoritraviv <[email protected]>
Wed, 17 Aug 2016 11:51:33 +0000 (14:51 +0300)
committeritraviv <[email protected]>
Wed, 17 Aug 2016 11:51:33 +0000 (14:51 +0300)

Trivial merge