Avalara
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0