Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	xchange-core/src/main/java/com/xeiam/xchange/rest/RestInvocationHandler.java