am c9c76a82: Merge "Fix Apache stack"

* commit 'c9c76a82c6d0bf2362044d899013832882f32c94':
  Fix Apache stack