Sync'd branch central with upstream @ Thu Oct 16 11:56:41 PDT 2014