https://github.com/2pisoftware/cmfive/issues/114
Merge branch '0-8-0-BRANCH' of https://github.com/2pisoftware/cmfive into 0-8-0-BRANCH