Merge branch '11720-govendor'
authorTom Clegg <tom@curoverse.com>
Sun, 21 May 2017 18:33:08 +0000 (14:33 -0400)
committerTom Clegg <tom@curoverse.com>
Sun, 21 May 2017 18:33:08 +0000 (14:33 -0400)
closes #11720


Trivial merge