Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <batya239@gmail.com>
Mon, 6 Jun 2016 05:47:52 +0000 (08:47 +0300)
committerDmitry Batkovich <batya239@gmail.com>
Mon, 6 Jun 2016 05:47:52 +0000 (08:47 +0300)

Trivial merge