GCC 4.8 Fix
Linux 3.4.68

Conflicts:
	Makefile

Conflicts:
	Makefile