Merge with 3.2 #6528 None, True, False are keywords in 3.x. Patch by R. Serwy.