JIN-13
Merge branch 'test' of https://github.com/project-fifo/jingles into test