Merge branch 'master' into multisubscribe

Conflicts:
	rxjava-core/src/main/java/rx/operators/OperatorGroupBy.java