Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixing up some breaking bugs