Merge branch 'master' into candidate-4.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>