Merged with upstream/unstable
Merge pull request #1 from izx64/armv7h

Armv7h
Merge 2