Fix NullPointerException in trim for null parameter.
Merge remote-tracking branch 'origin/master'