Carried over fixes from master branch on 08/25/2013 - 1620 hours
Versioning