Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fix wrong delay calculation
Merge branch 'hotfix-delay-calculation'
Adjust delay control
Add a test record for sixel
Merge branch 'master' into develop

Conflicts:
	main.c