Merge in patch for additional lib for SASL