Merge pull request #5389 from ByteAndNibble/master