More oops
Merge branch 'v3'

Conflicts:
	src/Quotelinks/QuoteYou.coffee