Merge branch 'hotfix-0.9.5.1'
inserting fix in plugin initialisation code and removing call to exit that is now not needed as actions can return false (to avoid problems when testing).
Merge branch 'hotfix-0.9.5.2' into develop