Merge remote-tracking branch 'origin/master'

And some spacing in math.