8th commit
Merge branch '1.5.0' of https://github.com/pnedov/Merchello into 1.5.0