Merge branch 'release/0.3.11' into develop
sort order should always affect comparators
Merge branch 'release/0.3.12'