Merge commit 'j6t/master' into devel