11308: Merge branch 'master' into 11308-python3
authorTom Clegg <tom@curoverse.com>
Thu, 4 May 2017 15:16:42 +0000 (11:16 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 4 May 2017 15:16:42 +0000 (11:16 -0400)

Trivial merge