Merge branch 'sppmupd'