Merge branch '1969-persistent-switch'
authorTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 17:56:21 +0000 (13:56 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 17:56:21 +0000 (13:56 -0400)
closes #1969


Trivial merge