Wrap up version 1.1.4.
Merge branch 'master' into features

Conflicts:
	upnpglobalvars.h