Sync'd branch central with upstream @ Thu Sep  4 18:32:37 PDT 2014