Merge branch 'master' into mykirbyblog
Cleaning
Merge branch 'mykirbyblog'