Pulled files from hans/master

Might fix linker errors related to AU.