Merge 201405 upgrade from test branch - 7/10/2014
Versioning