Merge remote-tracking branch 'origin/master2' into master2

Conflicts:
	HelloWorldSWT/HelloWorldSWT.java
	HelloWorldSWT/src/HelloWorldSWT.java
Merge remote-tracking branch 'origin/master2' into master2