more bugstomping
Merge branch 'eap-config' into rabe