PR #359

PR #359 is not in the merge queue.