More Oracle/PostgreSQL NULL sorting
Merge branch 'refs/heads/develop'