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

Trivial merge