Sync'd branch central with upstream @ Mon Aug 25 16:56:07 PDT 2014