Ticket 683

[Jeremy Dunck]

I've added a half-patch to ticket 683.  I don't understand all the
magick going down in meta and models, but I hope the bit I did was
useful.