julia

c281175d - Merge branch 'master' into kc/cglobal