Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9