Added mbenson commits from master branch