* imported the changes from 0.5.30 to 0.5.30ubuntu2