merged master into develop.

Status Job ID Name Coverage
  Windows
passed #569105
Windows10
masterJobWindows

00:01:29

 
  Linux
passed #569106
BranchJobLinux

00:01:54