Merge branch 'afatest'

Conflicts:
	jba_test.txt