merged
Merge branch 'strangegitIssue'