Merge pull request #524 from dorkster/bugfixes

Don't merge speed effects