Merge branch 'master' into dynconf2