10343: Merge branch 'master' into 10343-dockercleaner-config
authorTom Clegg <tom@curoverse.com>
Mon, 31 Oct 2016 20:08:01 +0000 (16:08 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 31 Oct 2016 20:08:01 +0000 (16:08 -0400)

Trivial merge