Fix #608
merged trunk
Fix #608
Merge branch 'master' of github.com:ralsina/nikola into theme-cleanup