Sync'd branch central with upstream @ Wed Oct 22 13:30:46 PDT 2014