Sync'd branch central with upstream @ Wed Oct 22 09:36:49 PDT 2014