Merge pull request #5253 from selanf/x13