Merge remote-tracking branch 'origin/Plasma/5.13'

Authored by aacid on May 21 2018, 9:02 AM.

Description

Merge remote-tracking branch 'origin/Plasma/5.13'

Merged Changes

CommitAuthorDetailsCommitted
628418199d42D12991aacid
Ensure the salt file is indeed a regular file 
May 21