Merge branch 'master' into 5735-edit-description-box-size
authorRadhika Chippada <radhika@curoverse.com>
Tue, 5 May 2015 18:16:38 +0000 (14:16 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 5 May 2015 18:16:38 +0000 (14:16 -0400)

Trivial merge