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