Merge remote-tracking branch 'origin/v1.0030'

Conflicts:
	.idea/workspace.xml