PR #367

PR #367 is not in the merge queue.