Merge "Replace non standard 'tt' with 'code' for better HTML5 conformity"