Merge branch 'master' into unittest

2 jobs for unittest in 2 minutes and 19 seconds (queued for 18 minutes and 7 seconds)
Status Job ID Name Coverage
  Windows
passed #167500
Windows10
masterJobWindows

00:01:07

 
  Linux
passed #167501
BranchJobLinux

00:01:12