Compatability Fix
Merge branch 'jstylo_master' into jsan_master