Merge Eric's latest commit, some manual fixups, linux compilation succeeds on Mint 13.10