Merge branch 'master' into 4024-pipeline-instances-scroll
authorradhika <radhika@curoverse.com>
Sun, 16 Nov 2014 21:18:56 +0000 (16:18 -0500)
committerradhika <radhika@curoverse.com>
Sun, 16 Nov 2014 21:18:56 +0000 (16:18 -0500)

Trivial merge