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