Merge branch 'master' into 2352-use-state
authorradhika <radhika@curoverse.com>
Thu, 8 May 2014 14:45:00 +0000 (10:45 -0400)
committerradhika <radhika@curoverse.com>
Thu, 8 May 2014 14:45:00 +0000 (10:45 -0400)

Trivial merge