It's not a 100% confirmation, but Ed Valentine is teasing that he possibly wrote Faults in Our Cutie Marks. Having written "Flight to the Finish" and "Three's a Crowd" I wonder what sort of episode this one will be?
Thanks to Nick for the heads up!
Source
Twitter: Calpain