Bugfix: No NPE thrown when passing null.
Merge remote-tracking branch 'origin/master'