Pull mt 14532 2.5

https://youtrack.mindtouch.us/issue/MT-14534
Reviewed by Steve