Merge branch '7.x' of https://github.com/uml-digitalinitiatives/manidora into 7.x