Merge branch 'develop'
Changes for modulus
Merge
Fixed lib refs
Client build process fixes
Various changes
Merge branch 'master' into develop