update to r55
Merge remote branch 'gero3/master'