Bookmark: correct description in import of html files
Merge remote branch 'origin/master'