Merge branch 'no-bareword-file-handles'