Merge branch 'test' into dev
Fixing some minor bugs: FIFO-514, FIFO-487, FIFO-513, FIFO-512, FIFO-508
Merge branch 'dev' of https://github.com/project-fifo/jingles into dev
Merge branch 'test' into dev