core 3.2.5 (closes #3550)
i18n conflict (closes #3031)
add LICENSE (closes #3408)
Merge pull request #6 from Eric-Brison/1.0-A3550

1.0 a3550