Fixed None comparasions as it could lead to bad __cmp__ calls
Merge branch 'master'