Fix issue #1011: Building develop branch fails