Merge commit 'origin/tortoisemerge' into devel