Copy/paste error
Merge remote-tracking branch 'origin/3.0-stable'