Merge branch 'master' into 3.0

Conflicts:
	errai-bus/src/main/java/org/jboss/errai/bus/server/io/BufferHelper.java