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