Whoops

I make some impressive moves in scripts...
Merge remote-tracking branch 'origin/5.0.x' into topic