fixed a npe caused by trim
Merge remote-tracking branch 'upstream/master'
saving changes