Merge pull request #785 from micmac1/ast20