#555

Request to merge #555 into the master branch.
We still have a lot of uses of the obsolete `draw` method in the test suites, but that was mostly to make sure the code was appropriately backwards compatible.  New tests should really use the new `drawImage` syntax.  It shouldn't make any difference here; you can just straight replace this with `drawImage`.