2014 - 07 - 04  - Merge from EQEmu master