Manual Merge of Pull Request #212

Manual merge of https://github.com/Netflix/RxJava/pull/212 with small reorganization of 1 file/package.