Resync with emul-linux-x86 20140406

Let me know if you have any issues - I've not fully tested all the
changes get