Merge with ponies

Finally, it'll merge! :D I've worked all the conflicts out, so now just needs to be updated again with ponies.