merged master into branch

3 jobs for draw_sample2 in 1 minute and 22 seconds (queued for 3 seconds)