Updates

Merge from upstream (hotemup)