Sync'd branch central with upstream @ Wed Oct 22 18:47:43 PDT 2014