Merge branch '3550-local-pipeline' closes #3550
authorTom Clegg <tom@curoverse.com>
Wed, 17 Sep 2014 22:01:03 +0000 (18:01 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 17 Sep 2014 22:01:03 +0000 (18:01 -0400)

Trivial merge