Merge branch 'master' into 'change_sampled_parameters'

# Conflicts:
#   tupak/sampler.py
3 jobs for change_sampled_parameters in 5 minutes and 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #78567
exitcode-jessie

00:05:23

 
  Deploy
passed #78568
pages

00:00:30

passed pages:deploy

00:00:00