Merge branch 'meta'

Conflicts:
	lib/winston-postgre.js