elkarte/Elkarte — pull request #497 by norv (2013-06-06 00:02:54+00:00)
Title: Cherrypicks

A few cherry-picks