served with a quote surprise on a crummy day, by AJAX of course of course
resolve merge conflict
Merge branch 'quote-surprise'