Bug #5876
Content #5874
Merge pull request #92 from apatel/master

redmine issues