clean AFTER setup of outer
Merge branch '1.x' into gh-pages