Manual Merge of #750

Manual merge of https://github.com/Netflix/RxJava/pull/751