last re-fix slim ..sorry #1117
Merge pull request #1122 from WaYdotNET/refix-slim

last re-fix slim ..sorry #1117
Merge remote-tracking branch 'upstream/master' into super-admin

* upstream/master:
  last re-fix slim ..sorry #1117