Merge pull request #566 from dhewg/ast