Merge branch 'pjhagel-dev'
Merge branch 'master' of https://github.com/linchpinstudios/yii2-blog