Imported SVN revision 564.
Merge branch 'master' of https://github.com/cinchurge/sparx