Changes and Contrib updates from last pull.