Merge branch 'master' into sleepingfix

Conflicts:
	rxjava-core/src/main/java/rx/concurrency/SleepingAction.java