Fixing some screenshot tests (menu order has changed)
Merge remote-tracking branch 'origin/master'