Merge branch 'hacking'