Merge pull request #588 from micmac1/18.06AST