Merge branch 'weirdDiffs'
Merge branch 'develop'