BUGFIX: Java 8 AssertJ problem
Merge branch 'develop'