Version 1.5 Sync Update
Merge remote-tracking branch 'origin/master'