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