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