Merge branch 'javer/master' into master

Conflicts:
	metadata/layout.conf
dev-php/hhvm: support building pgsql extension