Merge branch 'truecrypt_anche_no' into integration