Sync'd branch central with upstream @ Wed Oct  1 17:04:38 PDT 2014