starting Feature #6260
Bug #6319
Merge pull request #29 from apatel/master

redmine issues