Fix up for test plugin.
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git
Fix to problems with toolbar.
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git