Sync up with starttls-0.4