Develop tmp

This pull request merges release/2.8 with develop.  I had to fix a few files where additional commits had been made to release/2.8 that were not in the develop tree.