I also removed a comma because the word "or" was being used to introduce a dependent clause.
rebased onto c9f30e912deb8e84d4d08f6ae72878a16fa14886
Pull-Request has been merged by pbokoc
I also removed a comma because the word "or" was being used to introduce
a dependent clause.