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