This issue got introduced while porting the patch over 3.6 in r33897 SVN-Revision: 33913
SVN-Revision: 33911
SVN-Revision: 33897