Merge upstream master to this master

Keep jmanuel1:master up to data with latest changes.