formatting
Merge branch 'master' into 0.5.0.M5