Pull in the latest from master
Adjust the copy to account for latest master changes