fix the parent-tag
Merge branch 'master-spigot' into 1.5-spigot