Merge branch '11138-docker-load-fail'
authorTom Clegg <tom@curoverse.com>
Mon, 6 Mar 2017 15:31:40 +0000 (10:31 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 6 Mar 2017 15:31:40 +0000 (10:31 -0500)
closes #11138


Trivial merge