Admin / Thesaurus / NPE when creating keyword in a new thesaurus (#512).
Merge remote-tracking branch 'origin/develop' into develop