automated test potential fix
Merge branch 'feature/canjs-2.0' into brad