Merge 2.8 into Develop

This pull request merges 2.8 into Develop.  

- It should be pulled after we pull develop_tmp

- Once it is pulled someone has to change the version file so that the version string is 'develop'