Merge master branch
Merge branch 'mean' into lean-and-mean