Merge pull request #3641 from techee/hacking_update