Merge pull request #3871 from jow-/nail-fix-build