Merge branch 'release/2.0' into develop
Merge branch 'hotfix/2.1' into develop
move on_ping_timeout to be in the right place again
fix auth to be based on jids
fix the order of these checks
bump version
Merge branch 'release/3.0'