Merge branch 'persist_in_session'
Dagfinn Ilmari Mannsåker [Thu, 11 Feb 2016 17:36:35 +0000 (17:36 +0000)]

Trivial merge