updated build files
Merge branch 'next' into boyceg/update-build-system