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