Merge pull request #2806 from dibdot/magic