This merges 1.25 and resolves issue #37