merge from purgatory and zrender-touchhandlers