Merge branch 'mergeDelayErrorFix' of github.com:EmteZogaf/RxJava into 313-mergeDelayError

Unit test for https://github.com/ReactiveX/RxJava/issues/313
Fix mergeDelayError Handling of Error in Parent Observable

Fixes https://github.com/ReactiveX/RxJava/issues/313
Merge pull request #1830 from benjchristensen/313-mergeDelayError

Fix mergeDelayError Handling of Error in Parent Observable