Merge change I6478884a into eclair-mr2

* changes:
  Add string resource type inspection