Pulling all latest davidmoten changes

Synchronizing to 4.1