Merge pull request #6795 from mikeller/fix_changed_defines_in_3_5