Merge branch 'hotfix/v1.7.3'
Merge branch 'release/v1.8'
Update build to 64-bit to address Lion build issue
Merge branch 'master' into develop