Merge pull request #3806 from enpe:master

This commit is contained in:
Vadim Pisarevsky 2015-03-09 21:44:33 +00:00
commit 368213290f