update as of 1:06pm wednesday
Merge remote-tracking branch 'origin/master'