Enjoyable updated to 1.2
Merge pull request #7034 from ColinKinloch/master

Enjoyable updated to 1.2