Merge branch '11308-python3'
authorTom Clegg <tom@curoverse.com>
Mon, 8 May 2017 16:06:00 +0000 (12:06 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 8 May 2017 16:06:00 +0000 (12:06 -0400)
refs #11308


Trivial merge