Merge branch 'master' into arghdos-fixes