Sync'd branch central with upstream @ Thu Sep 18 15:24:36 PDT 2014