git-svn-id: http://svn.slightlymagic.net/forge/trunk@35755 269b9781-a132-4a9b-9d4e-f004f1b56b58
git-svn-id: http://svn.slightlymagic.net/forge/trunk@35700 269b9781-a132-4a9b-9d4e-f004f1b56b58