Merging in master.
Merging in master.
Merging in 1660-publication-updates.
Merging in master.
Update toolbar.
Merging in master.
Merging in 1649-pubref. All further publication development happens on this branch.
Merging in 1659-chtool. All further development for #1659 will happen in this branch.