Merge pull request #3133 from bmagyar:patch-1

This commit is contained in:
Vadim Pisarevsky
2014-08-19 22:23:59 +00:00