refactoring : replacing '== None' with 'is None', since there is always exactly one instance of None
Merge remote-tracking branch 'origin/master'