Merge branch 'master' into adjust/lokaltog