fixed issue with (install|update)SkelFiles and directories
Merge remote-tracking branch 'upstream/master'