Change-Id: If133b8324f5386156628f3b127fed8d483ad0ef5
Merge remote-tracking branch 'original/master'

Conflicts:
	README.md

Change-Id: I723c44575223579807d252c94a56549eebc8a0c5