Upstream merge as of Aug 25 #418

Icon difference rendering

Please file any issues here.

Icons with diff:

MODIFIED - icons/turf/ert_shuttle.dmi (0)

State Name (duplicate)	Old Icon	New Icon	Status
stan9			Modified
stan8			Modified
stan22			Modified
wy5			Modified
wy8			Modified
stan5			Modified
wy12			Modified
upp_rightengine			Modified
stan3			Modified
stan_inner_w_1			Modified
wy15			Modified
wy_leftengine			Modified
upp22			Modified
stan_inner_t_right			Modified
stan27			Modified
stan20			Modified
stan_rightengine			Modified
upp25			Modified
stan4			Modified
upp21			Modified
stan_inner_s_w			Modified
upp23			Modified
stan_inner_t_left			Modified
leftengine_3			Modified
stan_white_t_up			Modified
stan_black_t_down			Modified
upp5			Modified
upp27			Modified
wy27			Modified
wy_rightengine			Modified
wy4			Modified
stan_l_w			Modified
wy23			Modified
upp4			Modified
upp16			Modified
stan_leftengine			Modified
upp8			Modified
wy18			Modified
wy21			Modified
wy17			Modified
upp_leftengine			Modified
wy1			Modified
rightengine_3			Modified
stan21			Modified
wy2			Modified
wy9			Modified
wy13			Modified
upp2			Modified
wy25			Modified
rightengine_2			Modified
leftengine_2			Modified
stan_inner_w_2			Modified
stan_r_w			Modified
wy14			Modified
stan25			Modified
wy3			Modified
upp1			Modified
stan2			Modified
leftengine_1			Modified
wy16			Modified
upp3			Modified
wy19			Modified
upp20			Modified
stan1			Modified
stan_inner_dark			Modified
wy20			Modified
upp9			Modified
stan_black_t_up			Modified
rightengine_1			Modified
stan23			Modified
wy22			Modified