Carried over hubspot fix from test branch - 7/9/2014
Versioning