Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Wed, 20 Aug 2014 14:51:09 +0000 (10:51 -0400)
committerradhika <radhika@curoverse.com>
Wed, 20 Aug 2014 14:51:09 +0000 (10:51 -0400)

Trivial merge