Manual merge of mairbek/single Pull #157

Merging https://github.com/Netflix/RxJava/pull/157 which had conflicts and needed a manual merge.