1.21 Release - Develop Merge into Master

Proposed 1.21 release. Created a build on virtualbox and tested RDP and rsync, both work just fine. Look good?