Manual merge for PR #2.