Fix issue #1011: Building develop branch fails
Merge pull request #1012 from danosipov/issue-1011

Building develop branch fails