l1j rev 605
Merge branch 'master' into clan