v6.0.4
Merge branch 'master' of github.com:getnikola/nikola-site