Manual Merge of Pull #667

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