zx merge 2013/05/10