i3: merge in upstream configuration updates