Can't merge this, it will break as the Islandora Menu changes are not part of this release.