More recent version with gtk USE flag is upstream.
Merge branch 'develop'