Merge "strerror: incl enum name"