Remove trailing whitespace
Change space indentation to tabs
Merge conflicts
Azone fix for new compilers and possible fix for x64
Merge from master terrible