Merge branch 'master' into 4559-long-component-names
authorRadhika Chippada <radhika@curoverse.com>
Fri, 5 Dec 2014 15:10:01 +0000 (10:10 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Fri, 5 Dec 2014 15:10:01 +0000 (10:10 -0500)

Trivial merge