Fixed a typo in "relying"
Merge remote-tracking branch 'origin/2.1'
Merge remote-tracking branch 'origin/master' into experimental