Sync'd branch central with upstream @ Mon Aug 25 08:51:33 PDT 2014