Sync'd branch central with upstream @ Thu Sep  4 17:32:33 PDT 2014