remerge against correct branch

sigh squared..