PR #394

PR #394 is not in the merge queue.