Toast-ajax bug, wait not hidden.
Merge branch 'BugFixes' into toast-ajax