11308: Merge branch 'master' into 11308-python3
authorTom Clegg <tom@curoverse.com>
Mon, 8 May 2017 16:05:31 +0000 (12:05 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 8 May 2017 16:05:31 +0000 (12:05 -0400)

Trivial merge