Merge branch 'jlouis/fixes'