All problems with pasty resolved.
merge