Merge 1f54b7cceb81f6cb72b1ecee3c7e0f4bcd698438 on remote branch

Change-Id: Ib20c27026b6d0c901a1adf9e4e6cf69ac3fca23a
tree: c22966bb24e7b6cd6e23d30befc2de8210437897
  1. inc/
  2. src/
  3. LICENSE
  4. Makefile
  5. METADATA
  6. MODULE_LICENSE_BSD