upstream/0.6+git20160927
6fca535f · Fix build failure with new Pango ·