Merge branch 'master' into 2352-use-state
authorradhika <radhika@curoverse.com>
Wed, 7 May 2014 19:04:40 +0000 (15:04 -0400)
committerradhika <radhika@curoverse.com>
Wed, 7 May 2014 19:04:40 +0000 (15:04 -0400)

Trivial merge