Don't include sample images in update packages (Ref #3013)
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x