Merge branch 'hotfix/tsrmls_cc-again'
Add my email to CREDITS file
Merge branch 'hotfix/credits' into develop