recent update on trainer-api
Merge remote-tracking branch 'origin/master'