merge_fix
fix test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
oops, merge master crushed
(cherry picked from commit 29d2e77)