Remove Rx reference, since it's in base library as of v4.
Merge branch 'master'