Merge branch 'master' into 2199-crunch-virtualenv
authorTom Clegg <tom@floater1.office.curoverse.com>
Fri, 21 Feb 2014 15:14:13 +0000 (10:14 -0500)
committerTom Clegg <tom@floater1.office.curoverse.com>
Fri, 21 Feb 2014 15:14:13 +0000 (10:14 -0500)

Trivial merge