Merge branch 'tensorflow_group' into 'master'

Tensorflow group 2

See merge request !26
2 jobs for master in 19 minutes and 47 seconds (queued for 2 seconds)