Switch empty order messages
Merge pull request #533 from hoffmabc/master

Switch empty order messages