Merged your armor-meta branch for you

Copypaste from the other one: This wasn't really needed, but since you seem to be alive but computer-less, you could use the merge button in the github web UI.