Commit 274f0b9371d26a2e65a7d8842978dc92562b4c34

Edward Thomson 2015-07-15T09:17:35

Merge pull request #3311 from Fallso/MacroRedefinition Fix macro redefinition warning