Grammar fix
Merge branch 'testing' into testing_ARMv7