Merged in master at 4f35ff1275e05be31f5d41464ccf147e9dbfd016.
Closing.