PR #356

PR #356 is not in the merge queue.