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