Patches for dojo/aspect

Pull in two patches from upstream and fix a bug that's biting us internally.