Merge branch 'hotfix/0.4.1'
Convert IP to string before comparing to avoid unicode issues.
Merge branch 'haraldsk-master' into hotfix/0.4.2
Bumped version to 0.4.2
Merge branch 'hotfix/0.4.2' into develop

Conflicts:
	aws_ec2_assign_elastic_ip/settings.conf