Fix #494 #493
Merge branch 'master' of github.com:ralsina/nikola