Pull request to bring in Dan's changes.