merge PR #959