Merge Pull Request ahdiaz.