Sync'd branch central with upstream @ Thu Sep 11 15:34:57 PDT 2014