Fix #444
Merge branch 'master' of https://github.com/ralsina/nikola into planetoid_theme