Attempting to merge latest into node fork

Hold onto your butts...