Trac.elgg.org

Merge pull request #8694 from ewinslow/1.x-to-master