Merge commit 'jwb/merge' into merge