Merge branch 'master' into 2875-pipeline-description
authorradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 20:49:57 +0000 (16:49 -0400)
committerradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 20:49:57 +0000 (16:49 -0400)

Trivial merge