Updated build files with pull request from 1889854