FX-57: When a till is deleted Incorrect message is being displaying
Merge branch 'master' into module