Merge branch 'master' into raymond/postgress