Update classpath
Merge remote-tracking branch 'fetchFromGit/master'