am 7b7280fd: am 6ec44395: Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb

* commit '7b7280fd074e598dfa5351cdbef33984b7e36b76':
  Fix issue #3403539: WordPress crashes on Honeycomb