Merge branch 'master' into issue93

1 job for issue93 in 7 minutes and 10 seconds (queued for 1 second)