Applying this to the 2.1.1 branch: Fix SF bug #433904 (Alex Martelli) - all s_* methods return None only.