Force the required patch to be activated
Bump the version to 1.8.1
Merge branch 'master' into prototype