Merge branch 'master' into 4024-pipeline-instances-scroll
authorradhika <radhika@curoverse.com>
Wed, 12 Nov 2014 16:53:01 +0000 (11:53 -0500)
committerradhika <radhika@curoverse.com>
Wed, 12 Nov 2014 16:53:01 +0000 (11:53 -0500)

Trivial merge