Merging April 15, Monday changes to the main repo after thorough testing.