Closes bug #1690
Merge branch 'master' of github.com:jasonknight/salor-retail