Merge remote-tracking branch 'origin/master'
Removed dist mgmt and scm sections as they're not project specific.
Formated