port do_incorporate

db48x requested to merge db48x/reposurgeon:port-incorporate into master Oct 23, 2018