PR #355

PR #355 is not in the merge queue.