Fixed the build
Merge branch 'acwatson-master'
Merge remote-tracking branch 'upstream/master'