Merge pull request #8283 from ramele1907:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 2 Mar 2017 05:54:06 +0000 (05:54 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 2 Mar 2017 05:54:06 +0000 (05:54 +0000)

Trivial merge