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)