Merge pull request #3468 from alexrp/hwcap-improvements