[lightspark/el7] (46 commits) ...Merge remote-tracking branch 'origin/master' into el7