Merge pull request #3651 from mshabunin:shape-test
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Feb 2015 10:07:01 +0000 (10:07 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Feb 2015 10:07:01 +0000 (10:07 +0000)

Trivial merge