Merge branch 'pm' into devel-stable