Merge pull request #1466 from gottesmm/fix_build