Merge branch 'machinelearning'

3 jobs for master in 16 minutes and 45 seconds (queued for 1 second)