fixed 4.4 compatibility
Merge remote-tracking branch 'origin/jb2' into jb2
fixed 4.4 compatibility