Checking in the inspectors branch. Cmd I used:

svn merge -r4793:HEAD https://scalatest.googlecode.com/svn/branches/cs-forx4-merge


git-svn-id: http://scalatest.googlecode.com/svn/trunk@4797 fd1274fd-080f-5963-8033-43ee40fcd1de