Merge in Alex's pull request from 6/20