scoping issue #402
cleanup
Merge branch '2.x' into 2.6