Merge branch 'testing'
removed last modified header line as it is causing conflicts when rebasing/merging branches with master