Version bump to reflect recent merge