automerge: e8b451d * commit 'e8b451dd123b96252026992be3c96c9c577b4245': Have Pm return the correct code