HUBSPOT-23 #resolve

Signed-off-by: Donald Champion <donald@polishedgeek.com>
Merge branch 'master' of https://github.com/Spunkie/haPiHP into head