Synced to 3.2.4
Fixing minor annoyances for sfnetwork
Fixing smb.conf file
Merge branch 'plexelec-3.2-test', remote-tracking branch 'origin' into plexelec-3.2.4