Merge of 2.8 into Develop

This pull request is for a merge of 2.8 into develop. 

- I seem to remember thinking that pulling 2.8 into develop would help keep the conflicts to a minimum, but if this isn't the policy then feel free to delete this pull request. 

- There were a couple conflicts with files, which I fixed, and a mysterious conflict with mathjax (as a submodule) which I ignored.  Mathjax seems to work fine though...