Merge pull request #688 from mfournier/misc-build-cleanups