.merges

.merge+ #2769

Added

xiphon - For the Ubuntu build, did you have to do any speicifc work to get fonts loaded properly? I've got -fontconfig -system-freetype set, but it's not detecting the FT2 headers.