Import vmbt3_d.cpp from upstream and replace vmbt3_nd.cpp in the frobd build
Merge branch 'next'