v6.0.4-armv7a
f5d5bd62 · Merge branch 'stable' into stable-android ·