Sync'd branch central with upstream @ Wed Oct 29 13:17:44 PDT 2014