Sync'd branch central with upstream @ Thu Sep  4 06:07:35 PDT 2014