Merge branch 'master' into frestr-rename