Sync'd branch central with upstream @ Thu Oct 23 11:08:15 PDT 2014