Prep for Update to 1.8
Merge remote-tracking branch 'origin/master'