Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <batya239@gmail.com>
Thu, 14 Apr 2016 06:55:12 +0000 (09:55 +0300)
committerDmitry Batkovich <batya239@gmail.com>
Thu, 14 Apr 2016 06:55:12 +0000 (09:55 +0300)

Trivial merge