Left a reminder to rewrite treecap code using some pointers from bspkrs's treecapitator
Merge remote-tracking branch 'upstream/master'