Merge branch 'skip_with_error' of git://github.com/efcs/benchmark into efcs-skip_with_error