merge: mglaubitz
Merge branch 'master' of local repository into mglaubitz