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

Trivial merge