Merge branch 'hotfix/smbc'
Updated to PhlyComics 1.0.5
Merge branch 'hotfix/foxtrot' into develop