Trying to rebuild from old june commit
Committing merge
Merge branch 'fix-it'
Merge