Bump the build number to 10004
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode

Conflicts:
	version