Pull mt 13367 2.5

https://youtrack.mindtouch.us/issue/MT-13667
Reviewed by Arne

Arne please put into 0822 if possible