Merge branch 'Armour-master'