Merges in changes from master plus other enhancements