Fix building with git-head.
Merge branch '2067_fix'