If we get an abort in AjaxError, don't display an error message to the
end user
Merge branch 'develop' into release/12.0