Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated build
Merge pull request #357 from jpecht/master

updated build