Merge pull request #3473 from TobyWanKenobi:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 15 Dec 2014 18:04:01 +0000 (18:04 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 15 Dec 2014 18:04:01 +0000 (18:04 +0000)

Trivial merge