o Comply with RFC 3156. Closes #4029.