Resolve "update keywords & categories"

Stefan Hynekrequested to merge
315-update-keywords-categories into master

Closes #315 (closed)

Edited by Stefan Hynek

Merge request reports