closures as controller filters, clean output buffer on exception
Merge remote-tracking branch 'origin/master'