closes #6013
authorradhika <radhika@curoverse.com>
Mon, 6 Jul 2015 16:08:29 +0000 (12:08 -0400)
committerradhika <radhika@curoverse.com>
Mon, 6 Jul 2015 16:08:29 +0000 (12:08 -0400)
Merge branch '6013-cleanup-setup-impl'


Trivial merge