Merge pull request #1959 from yebblies/definetoifdef