Sync'd branch central with upstream @ Thu Aug 28 04:03:34 PDT 2014