squash merge

Signed-off-by: jomarshall <jomarshall@petsafe.net>