Sort by last name too.
Merge branch 'dev'