Merge upgrade 201408 from test branch- 8/11/2014
Versioning