Merge branch 'develop' into queries_extension_support

Conflicts:
	gorp.go