Merge pull request #277 from joolswills/armv6_unai_fix