Merge branch 'master' into 3153-auto-setup-user
authorradhika <radhika@curoverse.com>
Fri, 22 Aug 2014 14:30:59 +0000 (10:30 -0400)
committerradhika <radhika@curoverse.com>
Fri, 22 Aug 2014 14:30:59 +0000 (10:30 -0400)

Trivial merge