Merge pull request #1717 from jaredpar/vb-build-props