Merge remote-tracking branch 'upstream/develop'

Conflicts:
	laravel/database/query/grammars/grammar.php
	laravel/database/query/grammars/sqlserver.php