Address #56 of Issue Tracker, incorporated RFC6644