* (bug 814) Integrate AuthPlugin changes to support Ryan Lane's external