Buildfix
Merge branch 'master' into armjit