Merge branch 'master' into idea13

Conflicts:
	idea/testData/debugger/tinyApp/outs/skipClassloader.out
	update_dependencies.xml