loc
loc
Merge branch 'master' into edd