Merge branches 'feature/gittest/stephenf' and 'master'
new lines