Merge remote-tracking branch 'upstream/master' into v1.0

3 jobs for 1.0.2 in 2 minutes and 6 seconds