Merge #44.