Fixes #848
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x