do not include x86 type assembly if not compiling for x86
bump version after fixing compilation with configure default for non x86
Merge branch 'master' into debian-launchpad
update dependency for launchpad