PR #365

PR #365 is not in the merge queue.