Sync'd branch central with upstream @ Thu Oct 23 18:03:40 PDT 2014