Support for 1.8 and 1.7.10