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

Developer20