1.5.5
Merge remote-tracking branch 'upstream/master'
Update to 1.5.5