Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	
Signed-off-by: jplandrain <jplandrain@nidget.org>
Merge remote-tracking branch 'origin/master'

Signed-off-by: jplandrain <jplandrain@nidget.org>