Merge branch 'master' into 3153-auto-setup-user
authorradhika <radhika@curoverse.com>
Tue, 19 Aug 2014 21:30:26 +0000 (17:30 -0400)
committerradhika <radhika@curoverse.com>
Tue, 19 Aug 2014 21:30:26 +0000 (17:30 -0400)

Trivial merge