Merge pull request #10 from matmat/v2.15.x