Merge branch 'add_build_all'
Merge branch 'v1.7.5_plus'

Conflicts:
	.gitignore
Merge branch 'move_test_out_of_src'
Merge branch 'rename_test_files'
Merge branch 'add_arm_support'