Fixed NO_SANDBOX support.
Merge branch 'master' into parseURL

Conflicts:
	Makefile