Merge branch alfroch_add_continue_training with refs/heads/master into...

Merge branch alfroch_add_continue_training with refs/heads/master into refs/merge-requests/500/train
47 jobs for !500 with alfroch_add_continue_training into master in 27 minutes and 12 seconds (queued for 9 seconds)
merge train