Board Thread:Questions and Answers/@comment-24.23.3.218-20130811062647/@comment-5005547-20130921040106

RinHaru was supposed to be canon from the start, even the OPs and EDs reference this. Idk why the anime became MakoHaru all of a sudden. (RinHaru shipper here btw)

One important thing to notice is that in the ED animation, when Haru runs to the spring and sees Makoto, Nagisa and Rei, he just stops and gets surprised. But when he sees Rin reaching out his hand to him, he instantly jumps and his eyes shine like the times he's obsessed with water.

In fact, the ED might also be a spoiler to the later episodes (figuratively, of course).