Merge remote-tracking branch 'origin/master'
some layout stuff concerning equation padding