Merge avsm:master and fix CHANGES typo