sync
sync
sync
sync
sync
Merge branch 'master' into kettenis.1650panicfix