Merge branch 'master' into dynk2