fix error introduced in 15c6aa829c
Backport #14372 to 2014.7
Merge branch '2014.7' into develop