Merge branch 'master' of https://github.com/ralsina/nikola
Fixing import.