#FEC-1393 #comment added check for dropShadowColor
Merge remote-tracking branch 'origin/2.9-May-18' into 2.9-May-18