Merge pull request #5065 from JosJuice/character Fix issue 10146 (compilation issue because of colliding defines)
