Dev Elite and KAT merged

I'm not expecting you to merge this, but I figured there might be something in the diffs that pops out as to what's different in 4.2

cheers,
-d