[Merged] Merge from GR-Core Master

Latest code mirrors Play server as of 02/06/2014