Merge branch 'hotfix/1.5.5'
Merge branch 'develop' of github.com:jrmyward/blog into develop