Merge branch 'master' of ../nf-2.6