Sync'd branch central with upstream @ Mon Aug 25 13:26:36 PDT 2014