fix conflicts and update from upstream

6 jobs for master in 7 minutes and 51 seconds (queued for 52 seconds)
latest
Status Job ID Name Coverage
  Test
passed #4719
lint
test:lint

00:00:53

passed #4720
docker
test:py2.7

00:06:26

passed #4721
docker
test:py3.6

00:01:44

 
  Build
canceled #4724
build allowed to fail
build:doc

canceled #4722
build
build:py2

canceled #4723
build
build:py3