Making wrapHTMLError available on the keystone instance
Merge branch 'master' into plugin-fields

* master:
  Making wrapHTMLError available on the keystone instance