MCAPP 0.8.4?

Shavarsh's buggy merge? I think?