Merge branch 'stable'
Merge pull request #93 from oli-obk/fix/reconnect_race
Merge remote-tracking branch 'github/master'
Merge branch 'stable'
[Engine-XMPP] CS: remove unnecessary whitespace and newlines