Merged @futuretap's stuck-in-curlView bug pull request.