Testing merge 2
Merge branch 'master' of https://github.com/aleksanw/eclipse-test.git