Merge "ksmutils: 64 bit compile issues"