Merge branch 'hotfix-30'
Merge branch 'issue-stoke-36'
Merge branch 'issue-stoke-36'

Conflicts:
	Makefile
Merge branch 'issue-stoke-36'
Merge branch 'issue-stoke-36'
Small fix. IOPL spans to bits in eflags: eflags[12-13]
Merge branch 'issue-37' into develop

Conflicts:
	Makefile