our is not needed in cfg file (reverse-merged from commit 80ca02ca2add1f0b5cbceecaaa410c415664b2a6)
Merge branch 'upstream/master'
Merge branch 'upstream/issue-34'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'
Merge branch 'upstream/master'