Merge branch 'master' into 3453-arv-list-docker-images
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Sep 2014 14:53:52 +0000 (10:53 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Sep 2014 14:53:52 +0000 (10:53 -0400)

Trivial merge