Merge remote branch 'origin/autocomplete_cursor' into tvierling