Merge branch 'master' into oneclick_nn_training

2 jobs for oneclick_nn_training in 3 minutes and 49 seconds
latest