Update 20_fix_session_saving.dpatch to upstream version