PR #579

PR #579 is not in the merge queue.