Merge branch 'hotfix/0.10.2'
Merge branch 'hotfix/0.10.2'
Merge branch 'master' of github.com:PHPSC/phpsc-conf
Left over from the type conversion of talk tags (closes #85)
Merge branch 'hotfix/0.10.4' into develop