Merge branch 'master' into 5735-edit-description-box-size
authorRadhika Chippada <radhika@curoverse.com>
Mon, 4 May 2015 16:28:57 +0000 (12:28 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 4 May 2015 16:28:57 +0000 (12:28 -0400)

Trivial merge