Minor fix to setup
Merge branch 'master' into Fix