Merging 1.8 into master

Just making sure Travis is happy