- put back the null change - there's at least one place where null tries to get inserted. :(
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/Bacon/Database/Adapter/Mysqli.php