From Brian Haberman and Benoit Claise (via Barry)
OpsDir
Merge branch 'master' of github.com:mskucherawy/docs