Bring git materials over from master branch