Make test runner more robust in IE6-7
Merge branch 'master' into gh-pages