Merge branch '2872-folder-nav' into 2872-folder-nav-tests
authorradhika <radhika@curoverse.com>
Fri, 6 Jun 2014 18:52:00 +0000 (14:52 -0400)
committerradhika <radhika@curoverse.com>
Fri, 6 Jun 2014 18:52:00 +0000 (14:52 -0400)

Trivial merge