Content #5873
Bug #5875
Merge pull request #89 from apatel/master

redmine issues