Sync'd branch central with upstream @ Sat Aug 30 03:24:30 PDT 2014