Jump fix, scene fix
Shrine triggers!
Merge branch 'master' into timlaststuff