Fetched/merged from upstream and origin
merge
Fetched/merged from upstream and origin
Updates.
Cleaned up some old files