Merge origin/master

Conflicts:
	README.md
Signed-off-by: Buddhika <buddhik@pdhssp-ML350p.(none)>
Signed-off-by: root <root@pdhssp-ML350p.(none)>
Merge origin/master

Conflicts:
	README.md