Issue #1149: armour → armor
update new armour → armor after rebase
Merge pull request #1780 from Fandekasp/fix_armour

Issue #1149: armour → armor