Merge thedax's changes.