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