Merged two rules concerning the same hack
Merge branch 'master' into laptop