0001-Merge-branch-bugfix-build-failure-on-i386-into-maste.patch
