8491: Merge branch 'master' into 8491-import-build-tools
authorTom Clegg <tom@curoverse.com>
Fri, 11 Mar 2016 19:16:48 +0000 (14:16 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 11 Mar 2016 19:16:48 +0000 (14:16 -0500)

Trivial merge