Breaking API change to get compilation to work with Java 1.7
Merge branch 'jmock2' of github.com:jmock-developers/jmock-library into jmock2