Merge branch '6953-docker-image-cleaner' closes #6953
authorTom Clegg <tom@curoverse.com>
Tue, 1 Sep 2015 18:00:24 +0000 (14:00 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 1 Sep 2015 18:00:24 +0000 (14:00 -0400)

Trivial merge