Carried over fixes from test branch - 7/7/2014
Versioning