Merge branch 'master' into 3714-report-issue-issues
authorradhika <radhika@curoverse.com>
Thu, 28 Aug 2014 20:21:22 +0000 (16:21 -0400)
committerradhika <radhika@curoverse.com>
Thu, 28 Aug 2014 20:21:22 +0000 (16:21 -0400)

Trivial merge