Merge branch 'wip-MDL-31776-master-alternatenamesfix' of git://github.com/abgreeve...