Fix Merge Bug

Working on https://github.com/Netflix/RxJava/issues/1420
Merge pull request #1442 from benjchristensen/merge-bug

Merge Bug