Merge branch 'julia0.6'