Unused #includes removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	StringBuffer/StringBuffer.h