Merge branch 'master' of https://github.com/muffe/TSMessages
Merge branch 'master' into master_source