upgrade
Merge pull request #2 from tolry/sf-upgrade-2.5

upgrade 2.5