Merge commit 'jamessan/master' into dev/use-diffopt