Merge branch feature/jim.king/rebased_plugin_port_from_jim3 with...

Merge branch feature/jim.king/rebased_plugin_port_from_jim3 with refs/heads/master into refs/merge-requests/532/train
3 jobs for !532 with feature/jim.king/rebased_plugin_port_from_jim3 into master in 21 minutes and 48 seconds (queued for 2 seconds)
merge train