here you go, mike
Merge remote-tracking branch 'upstream/master'
updates