Whitespace cleanup.
Fixed toggleSelect calls.
Merge branch 'master' into TOOLS-177