Merge pull request #3563 from fritsch/aefixes2