Continuing the merge with bob.bio.base
bob.bio.base
bob.bio.base!37 (merged)
See merge request !14 (merged)