PR #387

PR #387 is not in the merge queue.