Merge commit 'origin/master' into abartlet-devel