Since the 1990s, there has been consolidation in New Zealand's state-owned tertiary education system. What school did Massey University combine with