Merge branch 'curl-matrix': fix #116