Fixing security issues and merging in changes.