Merge branch 'master' into 2-1-stable
make _slide partial more useful
make link field much wider
whitespace cleanup
Merge branch 'master' into 2-1-stable