[lightspark/el7: 46/46] Merge remote-tracking branch 'origin/master' into el7