Merge sebastiano's log strings. Fixes issue 330

Change-Id: Id6188758b14ed2732bc009ab0ba39e112a1f0950