Merge remote-tracking branch 'upstream/5.1.x' into 5.1.x
closes #202