Merge branch 'master' into development
No sorting fixtures during EDIT FIXTURES section.
Merge branch 'release/1.5'