Merge branch 'hacking'; commit 'ed4efc81c3af82e702ce7c36b798585c6479f753'