Fix eclipse project classpath
Merge branch 'master' into hack/with-binary-libraries

* master:
  Fix eclipse project classpath