Merge branch 'master' into 3016-pipeline-template-search-string
authorradhika <radhika@curoverse.com>
Wed, 30 Jul 2014 15:36:55 +0000 (11:36 -0400)
committerradhika <radhika@curoverse.com>
Wed, 30 Jul 2014 15:36:55 +0000 (11:36 -0400)

Trivial merge