merge in rt 3.6.6. *gulp*!