Update btsync 1.4 branch (versioning re-introduced for this branch)