Merge @662550 http://plugins.trac.wordpress.org/changeset/662550/mingle-forum