Merge remote-tracking branch 'origin/demote_headers'
Merge branch 'master' of https://github.com/getnikola/nikola