On Wed, 2016-08-03 at 15:12 +0200, Jan Holesovsky wrote: > I'd go back to the historical values; if we still fix it for 5.1.6 > there will be much less of the broken macros than if we keep the > changed version I think. I lean towards this as well, so did that in master and 5-2 and 5-1 backports are in gerrit. C.