3991: Merge branch 'master' into 3991-docker-workbench-address
authorTom Clegg <tom@curoverse.com>
Fri, 26 Sep 2014 01:55:17 +0000 (21:55 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 26 Sep 2014 01:55:17 +0000 (21:55 -0400)

Trivial merge