merge in rt 3.4.6. *gulp*!