Comment 31 for bug 1699838

Works as advertised! Thanks Dan!

I merged the branch to master for inclusion in 3.1. Although we are calling it a bug fix, with the new OUS giving libraries a new option, I'll leave it up to the 3.0 maintainer to determine if it should be backported any further.