merge 3.4/develop mysqli classes