Merge "extend sudo aliases"