Merge branch 'master' into 'config-support'

# Conflicts:
#   bob/pad/base/test/dummy/database.py
#   bob/pad/base/test/dummy/database_sql.py
18 jobs for config-support in 8 minutes and 46 seconds (queued for 22 seconds)
Status Job ID Name Coverage
  Build
passed #63435
conda-linux
build_linux_27

00:04:17

passed #63437
conda-linux
build_linux_34

00:05:04

passed #63439
conda-linux
build_linux_35

00:04:34

passed #63440
conda-macosx
build_macosx_27

00:03:25

passed #63438
conda-macosx
build_macosx_34

00:04:11

passed #63436
conda-macosx
build_macosx_35

00:03:23

failed #63014
conda-linux
build_linux_27

00:02:59

failed #63016
conda-linux
build_linux_34

00:04:01

failed #63018
conda-linux
build_linux_35

00:02:14

failed #63019
conda-macosx
build_macosx_27

00:02:22

failed #63017
conda-macosx
build_macosx_34

00:02:49

failed #63015
conda-macosx
build_macosx_35

00:02:17

 
  Test
passed #63024
conda-linux
test_linux_27

00:02:56

passed #63022
conda-linux
test_linux_34

00:03:06

passed #63020
conda-linux
test_linux_35

00:03:00

passed #63021
conda-macosx
test_macosx_27

00:03:18

passed #63023
conda-macosx
test_macosx_34

00:03:35

passed #63025
conda-macosx
test_macosx_35

00:03:16