Merge branch 'authors-autocomplete' into 'master'