Merge remote-tracking branch 'upstream/master'

Had to make changes to get things in line.