Merge branch 'bugfix/issue38' into develop

4 jobs for 3.13.1 in 10 minutes and 20 seconds (queued for 2 seconds)
latest