Fix warning when order is not set
Merge branch 'master' into paths