Check for None explicitly since it can be 0
Bump up version number
Merge remote-tracking branch 'origin/master'