Merge branch '32' into mingle.io
Merge branch '33' into mingle.io
Merge branch '34' into mingle.io

Conflicts:
	src/comp/web_test.go
Merge branch 'fuzzy-perf' into mingle.io
Merge branch 'limit' into mingle.io