Merge branch 'master' into jdk-8
Adjustments to deletion of EventCollector -> use also Mockito now
Merge branch 'jdk-8' of https://github.com/m34434/JavaGimmicks into jdk-8