PR #316

PR #316 is not in the merge queue.