Merge branch '7.x' of ssh://git.indexdata.com/home/git/pub/mkdru into 7.x