Sync with upstream (+ qml-mode)
Remove patch that was applied upstream.