manually merge master; fix reqs
manually merge; fix reqs