Sync'd branch central with upstream @ Mon Aug 25 17:21:34 PDT 2014