Sync with websockify
Pull 90b519edf0c1857d