Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 17:57:19 +0000 (13:57 -0400)
committerradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 17:57:19 +0000 (13:57 -0400)

Trivial merge