Replace lift . notFound to avoid a segfault bug
Fix a faulty rewrite rule
Merge remote-tracking branch 'origin/master' into HEAD