Manual Merge 940

Fixes https://github.com/Netflix/RxJava/pull/940 via manual merge.