Merge branch 'master' into issue64

1 job for issue64 in 4 minutes and 9 seconds (queued for 2 seconds)