Merge pull request #391 from micmac1/ast15-AST-2018-010-15