Change-Id: I635a1a9704171f70ef07dbe2ba23806cec0136b1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>