Fix assets_version support
Update CHANGELOG
Merge branch '2.0'