Sync'd branch central with upstream @ Thu Sep 11 16:52:40 PDT 2014