Merge pull request #253 from hhromic/buildfix-armv