Merge this

@dieschwarzekobra, merge this pull request (at the bottom) to update your repo with changes from silshack.  That should fix your page build issues.