Merge branch 'master' into devel/modula-2.