update reqs
Merge branch 'master' into develop