Merge pull request #1 from ferdiependon/test-1

Test 1.
Test.
Merge pull request #2 from ferdiependon/test-1

Change.
Merge branch 'master' into test-1

Conflicts:
	test2.sql