Fix sintax error that brokes autocomplete
Merge branch 'master' into fac24