fixes
fixes
beta fixes
Merge branch 'iss922_2'

Conflicts:
	test2
Merge branch 'dumbidea'
Update test1

insert
exp
pull
Merge branch 'master' into dumbidea

Conflicts:
	test1