Merge pull request #286 from micmac1/ast-up-for-15.05