Merge v1.0 changes back to master
Created by: lairdm
A number of fixes and enhancements have been made on the v1.0 branch which web is using. However these have never been copied back over to master.
Created by: lairdm
A number of fixes and enhancements have been made on the v1.0 branch which web is using. However these have never been copied back over to master.