Master to master

Multiple updates to pull into origin