Updated unittest.el from upstream
Merge branch 'master' into windows