Merge branch 'master' into 3714-report-issue-issues
authorradhika <radhika@curoverse.com>
Thu, 28 Aug 2014 19:39:32 +0000 (15:39 -0400)
committerradhika <radhika@curoverse.com>
Thu, 28 Aug 2014 19:39:32 +0000 (15:39 -0400)

Trivial merge