Now released
Update change log
Sync with upstream