Merge branch 'master' into 2221-complete-docker
authorTim Pierce <twp@curoverse.com>
Fri, 28 Feb 2014 15:55:48 +0000 (10:55 -0500)
committerTim Pierce <twp@curoverse.com>
Fri, 28 Feb 2014 15:55:48 +0000 (10:55 -0500)

Trivial merge