Merge remote-tracking branch 'jlentfer/foomatic' into next