Merge pull request #3475 from fhsm:master

This commit is contained in:
Vadim Pisarevsky 2014-12-06 08:08:44 +00:00
commit e0ab007b2b