Merge pull request #6816 from phunsukwangdu:devbranch1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jul 2016 15:50:11 +0000 (15:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jul 2016 15:50:11 +0000 (15:50 +0000)

Trivial merge