Images correspond to the right upgrade, unused images deleted
Merge remote-tracking branch 'origin/master'