Merge pull request #616 from notaz/arm_fixes
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 16 Aug 2015 22:16:18 +0000 (17:16 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 16 Aug 2015 22:16:18 +0000 (17:16 -0500)
ARM fixes


Trivial merge