Added missing file
Merge branch 'origin/convey-sql-connectors'
Merge branch 'origin/master'

Conflicts:
	libver.inc