Merge branch '2338-maintain-active-tab'
authorTom Clegg <tom@curoverse.com>
Fri, 11 Apr 2014 03:55:20 +0000 (23:55 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 11 Apr 2014 03:55:20 +0000 (23:55 -0400)
closes #2338


Trivial merge