Sync'd branch central with upstream @ Thu Oct 23 17:38:40 PDT 2014