Merge branch 'stmp' into devel