Merge remote-tracking branch 'origin/master' into swig

4 jobs for swig in 7 minutes and 29 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #2371
Android_build

00:06:42

passed #2369
Linux_Secured_Test

00:03:48

passed #2370
Linux_Unsecured_Test

00:03:01

passed #2372
whitespace_and_doxygen

00:01:29