Merge origin/master into notusecuelib

Conflicts:
	.gitignore
	LICENSE