Merge branch 'wdev-theme'
Merge branch 'master' of https://github.com/fwahlqvist/wdevbase