Merge pull request #9785 from totten/master-perm-msgtpl