Return statement
Function declaration
Merge branch 'master' into x86

Conflicts:
	parser.y