Merge branch 'master' into elharo-patch-1