Imported Upstream version 3.6.0~rc1
Merge tag 'upstream/3.6.0_rc1'

Upstream version 3.6.0~rc1
Update debian dir for new version
Prune old patches
Reapply spelling corrections