11720: Merge branch 'master' into 11720-govendor
authorTom Clegg <tom@curoverse.com>
Wed, 17 May 2017 20:48:09 +0000 (16:48 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 17 May 2017 20:48:09 +0000 (16:48 -0400)

Trivial merge