Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Fri, 15 Aug 2014 23:47:18 +0000 (19:47 -0400)
committerradhika <radhika@curoverse.com>
Fri, 15 Aug 2014 23:47:18 +0000 (19:47 -0400)

Trivial merge