Merge tag 'v1.1.1'

Conflicts:
	remmina-plugins/rdp/rdp_plugin.c
Merge branch 'master' of https://github.com/repzilon/Remmina