Bug fixes and Features from Redmine