Sync'd branch central with upstream @ Thu Sep 11 06:34:36 PDT 2014