Merge branch 'master' into 3153-auto-setup-user
authorradhika <radhika@curoverse.com>
Wed, 20 Aug 2014 15:43:34 +0000 (11:43 -0400)
committerradhika <radhika@curoverse.com>
Wed, 20 Aug 2014 15:43:34 +0000 (11:43 -0400)

Trivial merge