Merge branch 'master' into development
Ignores got corrupted
Merge branch 'development'