Copied relevant changes from commit 028d478f which was never merged from an...

Copied relevant changes from commit 028d478f which was never merged from an old branch. (Did not merge because half the commit was irrelevant).
1 job for master in 1 minute and 38 seconds
Status Job ID Name Coverage
  Build
passed #4219
build

00:01:38