adding the other half
Merge branch 'master' into lightweight