changes for 5.5
typo
modifications for 5.6
Merge remote-tracking branch 'upstream/master'