Merge pull request #3806 from enpe:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Mar 2015 21:44:33 +0000 (21:44 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Mar 2015 21:44:33 +0000 (21:44 +0000)

Trivial merge