Merge branch 'master' into def-lists