Fix #738
Merge branch 'master' of github.com:getnikola/nikola