Merge pull request #265 from raviosc/developer125

Changes For Testing
changes done by dev20 for shipping
dev20
Merge pull request #266 from raviosc/developer20

Developer20
Changes For Testing
Merge remote-tracking branch 'origin/master'