Merge branch 'master' into 2187-enhance-user-setup
authorradhika chippada <radhika@radhika.curoverse>
Thu, 20 Mar 2014 14:19:01 +0000 (10:19 -0400)
committerradhika chippada <radhika@radhika.curoverse>
Thu, 20 Mar 2014 14:19:01 +0000 (10:19 -0400)

Trivial merge