Our styleguide requires that `OR` is used instead of `||`, for better readability with some fonts.

Also, please remove the empty line at EOF, add a changelog entry and ... could you confirm if this is a fix for the same bug as in #1443?