Manual author sort
Merge branch 'develop' into master