"Ah, Marilla."
The Yukiji-isn't-really-leaving plot is typical anime stuff, but Hina saved it because, well, she's Hina. The Maria "filler" at the end is fun though. I wonder how Ayumu would react if she realizes the amazing maid in front of her is Hayate's crush...
Next episode: sine, cosine, and tangent?