Vanilla port

Jonathan Wilkesrequested to merge
vanilla-port into master

some very easy, cherry-picked fixes from pd vanilla

Merge request reports