* merge the remaining Ubuntu change: