for release 4.2.0
for release 4.1.1
remove some stray conflict markers
merge gtk3 branch into master
updated for release 4.1.0
for release 4.0.0
for release 3.18.0
for release 3.17.8
for release 3.17.8
for release 3.17.7
for release 3.17.7
for release 3.17.6
for release 3.17.6
for release 3.17.5
for release 3.17.5
for release 3.17.4
for release 3.17.4
for release 3.17.3
for release 3.17.3
for release 3.17.2