this has been merged on my end with recent master, so it is ready to be merged in. works on x86 linux.