Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Fri, 22 Aug 2014 20:22:32 +0000 (16:22 -0400)
committerradhika <radhika@curoverse.com>
Fri, 22 Aug 2014 20:22:32 +0000 (16:22 -0400)

Trivial merge