Merge remote branch 'upstream/master' into synology-fix
Merge remote branch 'upstream/master' into synology-fix
Changing to allow for version check.

Fix version check. 5 tweaks not version 4 compatible