Revert "Merge remote-tracking branch 'mrcheko/master'"

This reverts commit df7c139e2f614f8a951aae1b4889b920af0013fe, reversing
changes made to fec26342cd57269bc0801e5d901e00419fbc7cec.
Revert "Merge remote-tracking branch 'mrcheko/master'"

This reverts commit 4e360136b10061e29fd60492544aad59850513e7, reversing
changes made to 047bbe43b2ca08a63c8e18d2b4af52e0dbefb37b.

Conflicts:

	apps/openmw/mwmechanics/aicombat.cpp