Fix armoury bounding box/size mismatch.
Merge branch 'master' into vertexpack