Merge branch 'master' into unittest

2 jobs for unittest in 2 minutes and 19 seconds (queued for 18 minutes and 7 seconds)