Merge branch 'master' of https://github.com/Andris91/SDI.git
Merge branch 'master' of https://github.com/Andris91/SDI.git
Change-Id: If2ca70beef34bdba0d7188379c0ee0f9431ea426