Merge remote-tracking branch 'origin/master' into job-docker-images
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 3 Jul 2014 15:05:14 +0000 (11:05 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 3 Jul 2014 15:05:14 +0000 (11:05 -0400)

Trivial merge