Merging 1.6.8 into master