Merge branch 'master' into 3160-copy-unnamed-pipeline
authorradhika <radhika@curoverse.com>
Fri, 18 Jul 2014 14:44:26 +0000 (10:44 -0400)
committerradhika <radhika@curoverse.com>
Fri, 18 Jul 2014 14:44:26 +0000 (10:44 -0400)

Trivial merge