Merge branch '3153-auto-setup-tests' into 3153-auto-setup-user
authorradhika <radhika@curoverse.com>
Sat, 23 Aug 2014 15:07:57 +0000 (11:07 -0400)
committerradhika <radhika@curoverse.com>
Sat, 23 Aug 2014 15:07:57 +0000 (11:07 -0400)

Trivial merge