Port minor changes (CHANGELOG, version) from 0-stable to master