Merge 1.5.5 changes back to master.