min

Change-Id: I87400f222a1937f74d2c8900dd5f1de3ed73a9d0
*

Change-Id: I6ef669ea27d9655eeeb806bf61efd7169e06ae21
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md

Change-Id: I25178a8dc2206db8817e5e5d10bcad1e54e71d71