Inline to speed up some code
Merge remote-tracking branch 'supsuperorgin/master' into XCOM1_inline_fix
Merge pull request #593 from Yankes/inline_fix

Inline fix