Changes from next branch merged in.