Merge of Pull #212 for Take/TakeWhile Fixes

This is a manual merge of https://github.com/Netflix/RxJava/pull/212