Editor / Keyword / Fix layout with long keywords #665.
Merge remote-tracking branch 'upstream/stable-develop' into onegeology