Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 33d37e680cdcb7a8bcb6bacc3e486eea4a1494da.
Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 898872a5b9c1a15c181954b7b4fe61b4fed7bac6, reversing
changes made to 260b2822af40bdd9697a2cd98c11119c030f6c9b.
Revert "requirements file added"

This reverts commit 260b2822af40bdd9697a2cd98c11119c030f6c9b.