Merge remote-tracking branch 'origin/master' into stable

3 jobs for stable in 2 minutes and 30 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2773
lint
test:lint

00:00:28

passed #2774
docker
test:py2.7

00:02:01

54.0%
passed #2775
docker
test:py3.4

00:02:16

54.0%