sync CHANGES
Merge pull request #911 from avsm/master

sync CHANGES