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