Fixed an assembly issue on Cygwin64.
Merge branch 'v0.36'