Attempt to fix an assembly register issue on 32 bit x86.
Merge branch 'v0.36'