Summary of changes: c94f65b... Updated patch to work on both ARMv5 and ARMv7 (#921226) (*) 401e36b... fix typo (*) 8dcd2f2... Merge branch 'master' into f18 (*) This commit already existed in another branch; no separate mail sent