Merge dev-1.7.10 >> master

Painful merge :(
Eradicating files which reappeared due to merge madness