Merge branch 'refactoring_2016' into 'master'

bob.db.base.File does not accept client_id

See merge request !3
15 jobs for master in 6 minutes and 29 seconds (queued for 5 minutes and 10 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_27 #39816
conda-linux

00:01:04

passed build_linux_34 #39819
conda-linux

00:00:49

passed build_linux_35 #39821
conda-linux

00:00:56

passed build_macosx_27 #39817
conda-macosx

00:00:42

passed build_macosx_34 #39820
conda-macosx

00:00:41

passed build_macosx_35 #39818
conda-macosx

00:00:42

 
  Test
passed test_linux_27 #39825
conda-linux

00:00:59

68.0%
passed test_linux_34 #39823
conda-linux

00:00:48

68.0%
passed test_linux_35 #39822
conda-linux

00:00:52

68.0%
passed test_macosx_27 #39826
conda-macosx

00:00:43

68.0%
passed test_macosx_34 #39824
conda-macosx

00:00:43

68.0%
passed test_macosx_35 #39827
conda-macosx

00:00:44

68.0%
 
  Docs
passed docs_linux_35 #39828
conda-linux

00:00:41

 
  Wheels
passed wheels_linux_27 #39829
conda-linux

00:00:23

passed wheels_linux_35 #39830
conda-linux

00:00:35