MFH: 2019Q1 (krb5-devel will need to have all its previous commits brought up to level in 2019Q1 first)