Suppresses a warning raised by a prior hotfix.
Merge branch 'master' into dev