Merge "Fix a series of compiler warnings" into emu-master-dev