merge master of mwhite/Vellum

This is against master instead of develop because develop isn't up to date with master.

depends on vellum-includes branch of HQ