PR #349

PR #349 is not in the merge queue.