more effective AA movement masking
Merge remote-tracking branch 'upstream/master'