Merge branch 'master' into 'fixing-ci'

# Conflicts:
#   MANIFEST.in
#   bob/learn/__init__.py
#   bob/learn/tensorflow/__init__.py
12 jobs for fixing-ci in 8 minutes and 43 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #32542
conda-linux
build_linux_27

00:03:12

passed #32544
conda-linux
build_linux_34

00:03:04

passed #32546
conda-linux
build_linux_35

00:03:03

passed #32547
conda-macosx
build_macosx_27

00:01:59

passed #32545
conda-macosx
build_macosx_34

00:01:53

passed #32543
conda-macosx
build_macosx_35

00:01:53

 
  Test
passed #32552
conda-linux
test_linux_27

00:04:38

passed #32550
conda-linux
test_linux_34

00:04:39

passed #32548
conda-linux
test_linux_35

00:04:38

passed #32549
conda-macosx
test_macosx_27

00:04:35

passed #32551
conda-macosx
test_macosx_34

00:04:37

passed #32553
conda-macosx
test_macosx_35

00:04:34