Sync'd branch central with upstream @ Thu Sep 11 15:12:39 PDT 2014