Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb