added new patch
Merge commit '8cb81cd309f0293c919cfb95ae3250ed71b17162'

Conflicts:
	includes.h