Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Mon, 25 Aug 2014 17:29:39 +0000 (13:29 -0400)
committerradhika <radhika@curoverse.com>
Mon, 25 Aug 2014 17:29:39 +0000 (13:29 -0400)

Trivial merge